Skip to content

Conversation

nikic
Copy link
Contributor

@nikic nikic commented Jun 10, 2022

Update the FreeBSD toolchain to 12.3. FreeBSD 11 is EOL since September 30, 2021.

I've locally verified that the dist-x86_64-freebsd docker image builds successfully.

r? @Mark-Simulacrum

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jun 10, 2022
@JohnTitor
Copy link
Member

cc @asomers

@asomers
Copy link
Contributor

asomers commented Jun 12, 2022

This supersedes #89083 , right?

@nikic
Copy link
Contributor Author

nikic commented Jun 14, 2022

Yeah, this is the same change with updated version/path. I'm hoping we can drop our FreeBSD patches when rebasing to LLVM 14.0.5.

@klensy
Copy link
Contributor

klensy commented Jun 14, 2022

@asomers
Copy link
Contributor

asomers commented Jun 14, 2022

https://github.com/rust-lang/libc/blob/eecb6488efc88855d16e6c779af9e6a749ae947b/build.rs#L22-L36

This looks related?

Yes, but that's in the libc repo, and there's a separate issue for it. rust-lang/libc#2406 .

@Mark-Simulacrum
Copy link
Member

@bors r+ rollup=iffy

@bors
Copy link
Collaborator

bors commented Jun 18, 2022

📌 Commit 13b4000 has been approved by Mark-Simulacrum

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jun 18, 2022
@bors
Copy link
Collaborator

bors commented Jun 19, 2022

⌛ Testing commit 13b4000 with merge 6c9be6e...

@bors
Copy link
Collaborator

bors commented Jun 19, 2022

☀️ Test successful - checks-actions
Approved by: Mark-Simulacrum
Pushing 6c9be6e to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jun 19, 2022
@bors bors merged commit 6c9be6e into rust-lang:master Jun 19, 2022
@rustbot rustbot added this to the 1.63.0 milestone Jun 19, 2022
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (6c9be6e): comparison url.

Instruction count

This benchmark run did not return any relevant results for this metric.

Max RSS (memory usage)

Results
  • Primary benchmarks: no relevant changes found
  • Secondary benchmarks: mixed results
mean1 max count2
Regressions 😿
(primary)
N/A N/A 0
Regressions 😿
(secondary)
1.8% 1.8% 1
Improvements 🎉
(primary)
N/A N/A 0
Improvements 🎉
(secondary)
-3.5% -3.7% 2
All 😿🎉 (primary) N/A N/A 0

Cycles

Results
  • Primary benchmarks: mixed results
  • Secondary benchmarks: 😿 relevant regressions found
mean1 max count2
Regressions 😿
(primary)
2.1% 2.1% 1
Regressions 😿
(secondary)
3.1% 4.2% 2
Improvements 🎉
(primary)
-2.5% -2.5% 1
Improvements 🎉
(secondary)
N/A N/A 0
All 😿🎉 (primary) -0.2% -2.5% 2

If you disagree with this performance assessment, please file an issue in rust-lang/rustc-perf.

@rustbot label: -perf-regression

Footnotes

  1. the arithmetic mean of the percent change 2

  2. number of relevant changes 2

bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 27, 2022
Rebase LLVM submodule

This is a rebase of our LLVM fork onto LLVM 14.0.5, which is intended to be the last release of the 14.x series. Additionally:

 * I've dropped three patches that were needed to build on FreeBSD 11, which is no longer necessary after rust-lang#97944.
 * I've dropped some cherry-picks that were later reverted.
 * I've cherry-picked llvm/llvm-project@caa2a82 for rust-lang#96797 (fyi `@Amanieu)`
@Noratrieb Noratrieb mentioned this pull request Jul 1, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants